Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 05:38:43 +0000 (21:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 05:38:43 +0000 (21:38 -0800)

Trivial merge